Fix fallout from the show-close-button rename

I had overlooked ui files. We should really
validate those during build.

diff --git a/demos/gtk-demo/fishbowl.ui b/demos/gtk-demo/fishbowl.ui
index f1869990e6210028e8e3b77e4d8843c6c534461c..2579fc7290ec8e15e80363ba9d1a747475e8686d 100644 (file)
--- a/demos/gtk-demo/fishbowl.ui
+++ b/demos/gtk-demo/fishbowl.ui
@@ -6,7 +6,7 @@
     <child type="titlebar">
       <object class="GtkHeaderBar" id="">
         <property name="visible">True</property>
-        <property name="show-close-button">True</property>
+        <property name="show-title-buttons">True</property>
         <child>
           <object class="GtkLabel" id="info_label">
             <property name="visible">True</property>

diff --git a/demos/gtk-demo/main.ui b/demos/gtk-demo/main.ui
index 99b49572a2d7e7dc74979d32b025f83d3c6f870c..7e161685bb2a678a09ee212cf96f2021273ebf56 100644 (file)
--- a/demos/gtk-demo/main.ui
+++ b/demos/gtk-demo/main.ui
@@ -24,7 +24,7 @@
     <child type="titlebar">
       <object class="GtkHeaderBar" id="headerbar">
         <property name="visible">1</property>
-        <property name="show-close-button">1</property>
+        <property name="show-title-buttons">1</property>
         <child>
           <object class="GtkButton">
             <property name="visible">1</property>

diff --git a/demos/gtk-demo/modelbutton.ui b/demos/gtk-demo/modelbutton.ui
index 8fbd90c81db28892201a26c7b0169c5912d1e239..ead3da139a8886a2a92de719a4399cc987d39636 100644 (file)
--- a/demos/gtk-demo/modelbutton.ui
+++ b/demos/gtk-demo/modelbutton.ui
@@ -5,7 +5,7 @@
     <child type="titlebar">
       <object class="GtkHeaderBar">
         <property name="visible">1</property>
-        <property name="show-close-button">1</property>
+        <property name="show-title-buttons">1</property>
         <property name="title" translatable="yes">Model Button</property>
       </object>
     </child>

diff --git a/demos/icon-browser/window.ui b/demos/icon-browser/window.ui
index 68c876749f532f9df714f171a73615a01f8df77e..c04aec2aece0129495754b035d3fbd818777fd9c 100644 (file)
--- a/demos/icon-browser/window.ui
+++ b/demos/icon-browser/window.ui
@@ -15,7 +15,7 @@
       <object class="GtkHeaderBar" id="header">
         <property name="visible">True</property>
         <property name="title" translatable="yes">Icon Browser</property>
-        <property name="show-close-button">True</property>
+        <property name="show-title-buttons">True</property>
         <child type="title">
           <object class="GtkBox">
             <property name="visible">True</property>

diff --git a/demos/widget-factory/widget-factory.ui b/demos/widget-factory/widget-factory.ui
index b6d24cb99859e04ec24a9b8bb7a8814fac1da468..064c534f384bb41fa863272a7bc69a257fd74755 100644 (file)
--- a/demos/widget-factory/widget-factory.ui
+++ b/demos/widget-factory/widget-factory.ui
@@ -400,7 +400,7 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
     <property name="title">GTK+ Widget Factory</property>
     <child type="titlebar">
       <object class="GtkHeaderBar" id="headerbar1">
-        <property name="show-close-button">1</property>
+        <property name="show-title-buttons">1</property>
         <child type="title">
           <object class="GtkStackSwitcher" id="stack_switcher">
             <property name="stack">toplevel_stack</property>

diff --git a/examples/application10/window.ui b/examples/application10/window.ui
index 6c026972ad7e6e678b02969cf6b76ff8d7189c35..c751dc69fb26e335755da2ae6de972f906e3e593 100644 (file)
--- a/examples/application10/window.ui
+++ b/examples/application10/window.ui
@@ -8,7 +8,7 @@
         <child type="titlebar">
           <object class="GtkHeaderBar" id="header">
             <property name="visible">True</property>
-            <property name="show-close-button">True</property>
+            <property name="show-title-buttons">True</property>
             <child>
               <object class="GtkLabel" id="lines_label">
                 <property name="visible">False</property>

diff --git a/gtk/gtkshortcutswindow.c b/gtk/gtkshortcutswindow.c
index 7f77a53d78639533ba05363714c937a1e8babd45..6499c041b9ded0b2245bd6dfcee4d765f16e2e35 100644 (file)
--- a/gtk/gtkshortcutswindow.c
+++ b/gtk/gtkshortcutswindow.c
@@ -875,7 +875,7 @@ gtk_shortcuts_window_init (GtkShortcutsWindow *self)
   priv->search_image_group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
 
   priv->header_bar = g_object_new (GTK_TYPE_HEADER_BAR,
-                                   "show-close-button", TRUE,
+                                   "show-title-buttons", TRUE,
                                    NULL);
   gtk_window_set_titlebar (GTK_WINDOW (self), GTK_WIDGET (priv->header_bar));
 

diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c
index 3650734e544cb88cbf1c6cbc1dba9816d823ba67..eb00059de6e5f475f23981d6899cc8b7a433b55f 100644 (file)
--- a/gtk/gtkwindow.c
+++ b/gtk/gtkwindow.c
@@ -5973,7 +5973,7 @@ create_titlebar (GtkWindow *window)
   g_object_set (titlebar,
                 "title", priv->title ? priv->title : get_default_title (),
                 "has-subtitle", FALSE,
-                "show-close-button", TRUE,
+                "show-title-buttons", TRUE,
                 NULL);
   context = gtk_widget_get_style_context (titlebar);
   gtk_style_context_add_class (context, GTK_STYLE_CLASS_TITLEBAR);

diff --git a/gtk/inspector/window.ui b/gtk/inspector/window.ui
index 9ab57747ba482363a18b9abf50a07498c9a2fedd..f2a12c13c92178266699ec6c142dc98d43a47bfa 100644 (file)
--- a/gtk/inspector/window.ui
+++ b/gtk/inspector/window.ui
@@ -14,7 +14,7 @@
     <property name="icon">resource:///org/gtk/libgtk/inspector/logo.png</property>
     <child type="titlebar">
       <object class="GtkHeaderBar">
-        <property name="show-close-button">1</property>
+        <property name="show-title-buttons">1</property>
         <child>
           <object class="GtkStack" id="button_stack">
             <property name="visible-child-name" bind-source="top_stack" bind-property="visible-child-name"/>

diff --git a/gtk/ui/gtkaboutdialog.ui b/gtk/ui/gtkaboutdialog.ui
index ac0bfa7aac9733ef2fd3ac182b66cb73370c22d4..46f9c74a69b808f9e6accb37fa44fe8ecc095ddf 100644 (file)
--- a/gtk/ui/gtkaboutdialog.ui
+++ b/gtk/ui/gtkaboutdialog.ui
@@ -7,7 +7,7 @@
     <child internal-child="headerbar">
       <object class="GtkHeaderBar" id="headerbar1">
         <property name="visible">1</property>
-        <property name="show-close-button">1</property>
+        <property name="show-title-buttons">1</property>
         <child type="title">
           <object class="GtkStackSwitcher" id="stack_switcher">
             <property name="visible">0</property>

diff --git a/gtk/ui/gtkdialog.ui b/gtk/ui/gtkdialog.ui
index 250bfb1a7c429880c7c8f9a6c5e67eff15779e9d..0f7f3afc7641607dc9fb3ab4bd1f5b6db3dbb551 100644 (file)
--- a/gtk/ui/gtkdialog.ui
+++ b/gtk/ui/gtkdialog.ui
@@ -7,7 +7,7 @@
     <signal name="delete-event" handler="gtk_dialog_delete_event_handler" swapped="no"/>
     <child type="titlebar">
       <object class="GtkHeaderBar" id="headerbar">
-        <property name="show-close-button">1</property>
+        <property name="show-title-buttons">1</property>
       </object>
     </child>
     <child>

diff --git a/tests/testsplitheaders.c b/tests/testsplitheaders.c
index 7d89418886fb34a6448474e0fc0cd48d01a13054..62cb8902c9daf51a0f2d9416e11d29bb210e02ff 100644 (file)
--- a/tests/testsplitheaders.c
+++ b/tests/testsplitheaders.c
@@ -61,15 +61,15 @@ main (int argc, char *argv[])
   entry = (GtkWidget *)gtk_builder_get_object (builder, "layout-entry");
   g_object_bind_property (settings, "gtk-decoration-layout",
                           entry, "text",
-                          G_BINDING_BIDIRECTIONAL|G_BINDING_SYNC_CREATE);                      
+                          G_BINDING_BIDIRECTIONAL|G_BINDING_SYNC_CREATE);
   check = (GtkWidget *)gtk_builder_get_object (builder, "decorations");
   header = (GtkWidget *)gtk_builder_get_object (builder, "sidebar-header");
-  g_object_bind_property (check, "active", 
-                          header, "show-close-button",
-                         G_BINDING_DEFAULT);                      
+  g_object_bind_property (check, "active",
+                          header, "show-title-buttons",
+                         G_BINDING_DEFAULT);
   header = (GtkWidget *)gtk_builder_get_object (builder, "main-header");
-  g_object_bind_property (check, "active", 
-                          header, "show-close-button",
+  g_object_bind_property (check, "active",
+                          header, "show-title-buttons",
                          G_BINDING_DEFAULT);                      
   gtk_window_present (GTK_WINDOW (win));
 

diff --git a/tests/testtitlebar.c b/tests/testtitlebar.c
index 2e404574a5d4fdbdc7cdff6d665f4af28d308df9..49c89b528ad3b3e7130ed384ca4a9cc825023232 100644 (file)
--- a/tests/testtitlebar.c
+++ b/tests/testtitlebar.c
@@ -148,7 +148,7 @@ activate (GApplication *gapp)
   label = gtk_label_new ("Decorations");
   gtk_widget_set_halign (label, GTK_ALIGN_END);
   check = gtk_check_button_new ();
-  g_object_bind_property (header, "show-close-button",
+  g_object_bind_property (header, "show-title-buttons",
                           check, "active",
                           G_BINDING_BIDIRECTIONAL|G_BINDING_SYNC_CREATE);
   gtk_grid_attach (GTK_GRID (grid), label, 2, 0, 1, 1);